Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / t / t4135 / diff-with quote.diff
blobc8e8cc1a8d649fde97966e469920e658c1e83b44
1 --- "postimage".txt.orig 2010-08-18 20:13:31.744002255 -0500
2 +++ "postimage".txt 2010-08-18 20:13:31.744002255 -0500
3 @@ -1 +1 @@
4 -preimage
5 +postimage